* xsmfns.c (smc_die_CB): Call Fkill_emacs.

diff --git a/src/ChangeLog b/src/ChangeLog
index 94cc2712dc1a6252bcad4b8a3883622258aab2d2..6f9952faf45a3ac5275910dfd53b937eed05d4c3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-07  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * xsmfns.c (smc_die_CB): Call Fkill_emacs (Bug#7552).
+
 2010-12-06  Chong Yidong  <cyd@stupidchicken.com>
 
        * dispextern.h (struct it): New member overlay_strings_charpos.

diff --git a/src/xsmfns.c b/src/xsmfns.c
index ec5ca3b1a9f22ae0b0ef1b3d8c40f98808f11fc8..f6260d00a564aa9a322ef0e027f792b777e7b651 100644 (file)
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -298,6 +298,10 @@ smc_die_CB (smcConn, clientData)
      SmcConn smcConn;
      SmPointer clientData;
 {
+  /* This may behave badly if desktop.el tries to ask questions.  */
+  Fkill_emacs (Qnil);
+
+  /* This will not be reached, but we want kill-emacs-hook to be run.  */
   SmcCloseConnection (smcConn, 0, 0);
   ice_connection_closed ();
 }